From 065b633961df100f78610c62593b7312012737fa Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 20 Feb 2001 10:56:41 +0000 Subject: [PATCH] Actually copy the whole gc, not just the public parts. 2001-02-20 Alexander Larsson * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): Actually copy the whole gc, not just the public parts. * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): GDK_WINDOW_TEMP are not toplevel. Fixes selectable labels. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/linux-fb/gdkgc-fb.c | 2 +- gdk/linux-fb/gdkwindow-fb.c | 4 +++- 9 files changed, 67 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d350c5d75..42bcaf3857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-02-20 Alexander Larsson + + * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): + Actually copy the whole gc, not just the public parts. + + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): + GDK_WINDOW_TEMP are not toplevel. Fixes selectable + labels. + 2001-02-19 Havoc Pennington * gdk/gdkwindow.c: docs diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3d350c5d75..42bcaf3857 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2001-02-20 Alexander Larsson + + * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): + Actually copy the whole gc, not just the public parts. + + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): + GDK_WINDOW_TEMP are not toplevel. Fixes selectable + labels. + 2001-02-19 Havoc Pennington * gdk/gdkwindow.c: docs diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3d350c5d75..42bcaf3857 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2001-02-20 Alexander Larsson + + * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): + Actually copy the whole gc, not just the public parts. + + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): + GDK_WINDOW_TEMP are not toplevel. Fixes selectable + labels. + 2001-02-19 Havoc Pennington * gdk/gdkwindow.c: docs diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3d350c5d75..42bcaf3857 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2001-02-20 Alexander Larsson + + * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): + Actually copy the whole gc, not just the public parts. + + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): + GDK_WINDOW_TEMP are not toplevel. Fixes selectable + labels. + 2001-02-19 Havoc Pennington * gdk/gdkwindow.c: docs diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3d350c5d75..42bcaf3857 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2001-02-20 Alexander Larsson + + * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): + Actually copy the whole gc, not just the public parts. + + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): + GDK_WINDOW_TEMP are not toplevel. Fixes selectable + labels. + 2001-02-19 Havoc Pennington * gdk/gdkwindow.c: docs diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3d350c5d75..42bcaf3857 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2001-02-20 Alexander Larsson + + * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): + Actually copy the whole gc, not just the public parts. + + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): + GDK_WINDOW_TEMP are not toplevel. Fixes selectable + labels. + 2001-02-19 Havoc Pennington * gdk/gdkwindow.c: docs diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3d350c5d75..42bcaf3857 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2001-02-20 Alexander Larsson + + * gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy): + Actually copy the whole gc, not just the public parts. + + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new): + GDK_WINDOW_TEMP are not toplevel. Fixes selectable + labels. + 2001-02-19 Havoc Pennington * gdk/gdkwindow.c: docs diff --git a/gdk/linux-fb/gdkgc-fb.c b/gdk/linux-fb/gdkgc-fb.c index ba707c286c..b9252d1561 100644 --- a/gdk/linux-fb/gdkgc-fb.c +++ b/gdk/linux-fb/gdkgc-fb.c @@ -397,7 +397,7 @@ gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc) if (dst_private->values_mask & GDK_GC_CLIP_MASK) gdk_pixmap_unref(dst_private->values.clip_mask); - *dst_gc = *src_gc; + *dst_private = *GDK_GC_FBDATA (src_gc); if (dst_private->values_mask & GDK_GC_FONT) gdk_font_ref(dst_private->values.font); if (dst_private->values_mask & GDK_GC_TILE) diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index 8abe98cb56..46dbaa6e6d 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/gdk/linux-fb/gdkwindow-fb.c @@ -177,7 +177,9 @@ gdk_window_new (GdkWindow *parent, g_return_val_if_fail (attributes != NULL, NULL); - if (!parent || attributes->window_type != GDK_WINDOW_CHILD) + if (!parent || + (attributes->window_type != GDK_WINDOW_CHILD && + attributes->window_type != GDK_WINDOW_TEMP)) parent = gdk_parent_root; parent_private = (GdkWindowObject*) parent; -- 2.30.2